From 5be94c1fd730ac436c57f4effb210863edbcaaa6 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 2 Aug 2017 13:59:26 +0100 Subject: [PATCH] gtk-demo: Get rid of GtkEventBox --- demos/gtk-demo/clipboard.c | 58 +++++++++++++++------------------ demos/gtk-demo/event_axes.c | 17 +++++----- demos/gtk-demo/font-features.ui | 15 +++------ 3 files changed, 41 insertions(+), 49 deletions(-) diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c index dc3f11c860..a9576aa2c1 100644 --- a/demos/gtk-demo/clipboard.c +++ b/demos/gtk-demo/clipboard.c @@ -207,7 +207,7 @@ do_clipboard (GtkWidget *do_widget) GtkWidget *vbox, *hbox; GtkWidget *label; GtkWidget *entry, *button; - GtkWidget *ebox, *image; + GtkWidget *image; GtkClipboard *clipboard; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); @@ -268,53 +268,49 @@ do_clipboard (GtkWidget *do_widget) /* Create the first image */ image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_BUTTON); - ebox = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (ebox), image); - gtk_container_add (GTK_CONTAINER (hbox), ebox); - - /* make ebox a drag source */ - gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY); - gtk_drag_source_add_image_targets (ebox); - g_signal_connect (ebox, "drag-begin", + gtk_container_add (GTK_CONTAINER (hbox), image); + + /* make image a drag source */ + gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY); + gtk_drag_source_add_image_targets (image); + g_signal_connect (image, "drag-begin", G_CALLBACK (drag_begin), image); - g_signal_connect (ebox, "drag-data-get", + g_signal_connect (image, "drag-data-get", G_CALLBACK (drag_data_get), image); - /* accept drops on ebox */ - gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, + /* accept drops on image */ + gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY); - gtk_drag_dest_add_image_targets (ebox); - g_signal_connect (ebox, "drag-data-received", + gtk_drag_dest_add_image_targets (image); + g_signal_connect (image, "drag-data-received", G_CALLBACK (drag_data_received), image); - /* context menu on ebox */ - g_signal_connect (ebox, "button-press-event", + /* context menu on image */ + g_signal_connect (image, "button-press-event", G_CALLBACK (button_press), image); /* Create the second image */ image = gtk_image_new_from_icon_name ("process-stop", GTK_ICON_SIZE_BUTTON); - ebox = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (ebox), image); - gtk_container_add (GTK_CONTAINER (hbox), ebox); - - /* make ebox a drag source */ - gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY); - gtk_drag_source_add_image_targets (ebox); - g_signal_connect (ebox, "drag-begin", + gtk_container_add (GTK_CONTAINER (hbox), image); + + /* make image a drag source */ + gtk_drag_source_set (image, GDK_BUTTON1_MASK, NULL, 0, GDK_ACTION_COPY); + gtk_drag_source_add_image_targets (image); + g_signal_connect (image, "drag-begin", G_CALLBACK (drag_begin), image); - g_signal_connect (ebox, "drag-data-get", + g_signal_connect (image, "drag-data-get", G_CALLBACK (drag_data_get), image); - /* accept drops on ebox */ - gtk_drag_dest_set (ebox, GTK_DEST_DEFAULT_ALL, + /* accept drops on image */ + gtk_drag_dest_set (image, GTK_DEST_DEFAULT_ALL, NULL, 0, GDK_ACTION_COPY); - gtk_drag_dest_add_image_targets (ebox); - g_signal_connect (ebox, "drag-data-received", + gtk_drag_dest_add_image_targets (image); + g_signal_connect (image, "drag-data-received", G_CALLBACK (drag_data_received), image); - /* context menu on ebox */ - g_signal_connect (ebox, "button-press-event", + /* context menu on image */ + g_signal_connect (image, "button-press-event", G_CALLBACK (button_press), image); /* tell the clipboard manager to make the data persistent */ diff --git a/demos/gtk-demo/event_axes.c b/demos/gtk-demo/event_axes.c index 82ec258ba4..544f0a782e 100644 --- a/demos/gtk-demo/event_axes.c +++ b/demos/gtk-demo/event_axes.c @@ -140,6 +140,9 @@ update_axes_from_event (GdkEvent *event, return; } + if (!source_device) + return; + if (!sequence) { info = g_hash_table_lookup (data->pointer_info, device); @@ -614,7 +617,7 @@ do_event_axes (GtkWidget *toplevel) { static GtkWidget *window = NULL; EventData *event_data; - GtkWidget *box, *label; + GtkWidget *label; if (!window) { @@ -625,22 +628,20 @@ do_event_axes (GtkWidget *toplevel) g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window); - box = gtk_event_box_new (); - gtk_container_add (GTK_CONTAINER (window), box); - gtk_widget_set_support_multidevice (box, TRUE); + gtk_widget_set_support_multidevice (window, TRUE); event_data = event_data_new (); - g_object_set_data_full (G_OBJECT (box), "gtk-demo-event-data", + g_object_set_data_full (G_OBJECT (window), "gtk-demo-event-data", event_data, (GDestroyNotify) event_data_free); - g_signal_connect (box, "event", + g_signal_connect (window, "event", G_CALLBACK (event_cb), event_data); - g_signal_connect (box, "draw", + g_signal_connect (window, "draw", G_CALLBACK (draw_cb), event_data); label = gtk_label_new (""); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_container_add (GTK_CONTAINER (box), label); + gtk_container_add (GTK_CONTAINER (window), label); init_pad_controller (window, label); } diff --git a/demos/gtk-demo/font-features.ui b/demos/gtk-demo/font-features.ui index a47e92258b..0bd2645264 100644 --- a/demos/gtk-demo/font-features.ui +++ b/demos/gtk-demo/font-features.ui @@ -1601,18 +1601,13 @@ 20 20 - + 1 + 1 + 0 + 0 + start - - - 1 - 1 - 0 - 0 - start - - label -- 2.30.2